Imported Upstream version 17.5