Use scope class instead of wrapper function (OMS-413)
Cleanup (OMS-413)
Merge branch 'oms-413'