Config sync for hotfix
2.8.7.1 hotfix for RR-MAIN
2.8.7.1 hotfix for RR-YOGS