Merge "Alternate bouncer focuses on FP indicator" into main