Imported Upstream version 4.2.7