Backport #17001 to 2014.1
Merge pull request #17011 from basepi/peerminepillar2014.1

Backport #17001 to 2014.1