Merge "GSF variations on Bouncer" into main