Merge change 435

* changes:
  NJ-1399 "omx proxy crash"