Merge "Fix ALTERNATE_BOUNCER->GONE..." into main