T336417

From Patch demo (993810,1 993809,1)