Misc Backports

Backport #15917 to 2014.7
Backport ca767a5 to 2014.7