Merge "Add CM Legal (1 of 2)" into cm-11.0