fix for #15585
Merge pull request #15972 from rallytime/bp-15775

Backport #15775 to 2014.7