Merge commit '944d36221694e085524525500d23a920d4a0aeea' into BETA_JAVA16