Closes #16814 Refs http://wkbug.com/147284 Refs http://openradar.appspot.com/21993128 [skip sauce]
Attach a file by drag & drop or click to upload
