Merge "Allow syncs to be scheduled as EJs." into sc-dev