Merged from 7.1.5.1 (jdk9) branch
Authored by: jost_boekemeier 2018-01-07
Parent: [r1170]
Child: [r1172]