LPS-36507 Ignore checks if group deletion is in progress (groupId getter/setter is not needed here, but in future may be useful)
LPS-36507 Reset in case there's an exception half way so we don't get stuck