Align on released 6.0