Cherry-pick #16035 to 2014.1

Cherry-pick #16035 to 2014.1