Merge "Revert "Add betterbug folder to gs-common"" into main