Align to 5.9.6-SNAPSHOT and add unit test