Merge "Add a note about keeping a dimension value in sync with CTS" into sc-dev