Merge "Revert sync app op chain changes" into sc-dev