Merge branch 'patch/JAL-2116_java9' into develop