Using a single compile scope dependency for everything upstream
Updating main to gs-main