Created by: cvrebert
Refs #16814 (closed), http://wkbug.com/147284, http://openradar.appspot.com/21993128