Merge branch 'master' at M5 into 'OT_BETA_JAVA8'