Merge branch 'feature/647' into 'develop'