Backport #15317 to 2014.1
Merge pull request #15322 from s0undt3ch/2014.1

Backport #15317 to 2014.1