Merge branch 'develop' into 49-investigate-test-failures-in-maven-deploy-process