Merge "Remember to prepare() jobs when synthesizing them"