Imported Upstream version 7.1.614