Merge branch 'nextRelease' into nr/testHarness_subProjects