Merge "Bug 3173 - group flows rendering fix."