MDL-10383 - some more groupings related restore problems fixed - groupings are now...