Merge "Clean up Session2Record in MCS" into sc-dev