Merge branch 'develop' into review-minor-tests-issues