Merge "Cleaned up and optimized wfBaseConvert();"