Merge pull request #1368 from TheBlueMatt/2022-03-fix-post-start-sync