Oms 362

Has interdependecies with OMS-369. Make sure both OMS and KNOT are updated to latest revisions.