In line with changes required by CWM CM-10.2