REL-2089

Merging from release branch.