Merge remote-tracking branch 'origin/master' into medvedev/oc-11785