Merge "[flexiglass] Bouncer refactoring, improvements and fixes." into main