CR changes -- synchronization overhaul and config