Imported Upstream version 3.052