[[ Bug 12852 ]] Make sure we use the converted value of the input from t...

I've merged this into release-6.6.3 - that latter just needs to be merged into develop after the current build is completed.