Merge branch 'master' into medvedev/oc-11785