(ITS#6684) Patch for autogroup overlay