Align on 5.9.4-SNAPSHOT