Merge "Dynamic grouping failed the first time" into rvc-dev