Backport #16886 to 2014.7
Merge pull request #16903 from techhat/backport16886

Backport #16886 to 2014.7