Merge branch 'update/java-11-lts' into next