Merge "Fix issue #32180780: Sync adapters inappropriately being run..." into oc-dev