Imported Upstream version 17.0.7