Updated to the new OM
Updated for RC2
Merge remote-tracking branch 'origin/RC-update'