Imported Upstream version 602
Imported Upstream version 603