cleanup; align on 5.9.5-SNAPSHOT