Imported Upstream version 5.1.2
Merge tag 'upstream/5.1.2'

Upstream version 5.1.2
5.1.2