Fixes typo in setters
Merge branch 'develop' into feature
Updated Version 3.3.014.041