Config sync
2.8.7.4 bugfix update for RR-MAIN