[[ Bug 12852 ]] Make sure we use the converted value of the input from the EP rather than the original value when setting labels of buttons.
Merge branch 'bugfix-12852' into release-6.6.3