Improve logging with more context (OMS-313)
Merge branch 'oms-313'