Modify OTM & SRM according to spec CR document.