Imported Upstream version 2.1.2
Merge tag 'upstream/2.1.2'

Upstream version 2.1.2