Imported Upstream version 4.6