Preparing a possible 12.2 release, and improving compatibility with JDK 16

15 files changed