Merge "Fix some bugs in FRP hardening" into main