Oms 369

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