Merge "Modernize alternate bouncer logic"