Hotfix for 2.1.39.
Merge branch 'master' into develop