This is a new fix to replace #20361 due to the synchronize module changing sufficiently to make that commit no longer merge cleanly. Fixes #20361 Related to #20311