trc492 Sync'd Frc changes.

Users who have contributed to this file

• trc492
• miketsang