Move r31998 here to fix mapping problem from earlier commit
Repair merge error in prior CMR