Merge "Fix EJ syncs." into sc-dev