Imported Upstream version 6.3.3