Fixes issue with data type pre-values and using PreValueAsArray when they are dictionary formatted.
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2