Merge commit 'd5b358d4b0f94e846fece0d3db79a5a0366dc5ed' into BETA_JAVA14