Merge branch 'develop' into feature/David-6.2 - resolving conflicts