Forward-port #15378 to 2014.7

Forward-port #15378 to 2014.7