Imported Upstream version 6.2.1