Updates from cm repo