Config sync
2.8.7.0 XML update for RR-MAIN