Created by: cvrebert
Closes #16988 (closed). Refs http://wkbug.com/148061, http://openradar.me/22299624