Imported Upstream version 7.6.3