Align to 7.1-SNAPSHOT with compat 5.9.5 and 6.0, add unit test