Imported Upstream version 5.3