Merge branch 'medvedev/oc-11785'