Merge "Preparation for JDK17"