Merge conflick fix from cherry-pick
Fixed typos in rendezpass comments