Imported Upstream version 6.5.5