Merge branch 'master' into JAMES-3260-gradle-poc