Imported Upstream version 1.0.4k