Merge "Revert "Alternate bouncer focuses on FP indicator"" into main