Align with the forthcoming 6.0 final.