Backporting changes from osp-11 branch.
7 files changed