Forward-port #15141 to 2014.7

Forward-port #15141 to 2014.7