Config sync for 2.9.2.4
2.9.2.4 update for RR-MAIN