MCV no longer loses controlgroup when transforming
Merge pull request #6765 from huwpascoe/mcvgroup

Fixes #6763