Backport #15165 to 2014.7

Backport #15165 to 2014.7
Is it backwards compatible as well?  If so, would you mind submitting a pull request against the 2014.7 branch?