Merge "Update annotations to spec for mso"