Merge "Revert "Remove SSG timeout when SSG is complete"" into main