Merge "Move OM calls to the background" into sc-dev