Commit post merge. Compile but groups has been partially lost.
Adding groups