Imported Upstream version 4.2~13046