Backport #19221 to 2015.2

Backport #19221 to 2015.2