Imported Upstream version 4.0.4