Refactoring: no decoding until needed (OMS-462)
Merge branch 'oms-462'