Forward-port #15078 to 2014.7

Forward-port #15078 to 2014.7