Align on 5.7.2-SNAPSHOT