Merge "Enable teamfood on the bouncer messages feature" into main