Merge branch 'develop' into feature/Issue50