Imported Upstream version 1.15.1
Merge tag 'upstream/1.15.1'

Upstream version 1.15.1