Imported Upstream version 3.14.5