Merge pull request #3959 from 1Dragoon/backports/2.1.4

Backports/2.1.4