Fixes setting Validation issues
Merge branch 'develop' into feature
Merge branch 'feature' into develop
Updated Version 3.2.032.032