Align with CM-10.2