Merge pull request !1357 from SuchJack/master-jdk17-dev
Merge pull request !1358 from SuchJack/master-jdk17-dev1