Merge branch 'master' at 2.2M4 into 'OT_BETA_JAVA8'