There will be significant refactoring work to support compiling and tests passing on newer JDK versions 9, 10, and 11.
