US632 - attempt to fix field id issue when encrypted
Merge branch 'release' into development