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