Merge "Hard deprecate wfBaseConvert()"