Merge branch 'feature/Encryption' into develop
Merge branch 'develop' into feature/Encryption