Imported Upstream version 2.1.4
Merge tag 'upstream/2.1.4'

Upstream version 2.1.4