It is a cherrypicking from revisions 9458 and 9679 of 7.0 branch, manually merging conflicting lines.
« Back to merge proposal
It is a cherrypicking from revisions 9458 and 9679 of 7.0 branch, manually merging conflicting lines.