Align on 5.7-SNAPSHOT