Merged fix for 17289154 with trunk