Merge "fix(cm): save guarded control stack registers" into integration