Merge "Fix broken ff/rw action text." into nyc-support-24.1-dev