[1.3.4] Changes from 1.3.3 pr #2681
Merge pull request #2915 from mruz/1.3.4

[1.3.4] Changes from 1.3.3 pr #2681