Or maybe could you make a mergeable branch for the group fix ? Or a branch for each fix ? @jbfavre did it, I’ve had no problem to merge his fixes.