Bring cycle0/RSM-mainline branch up to date.
Fix casarest checkout typo