Merge pull request #13968 from electricjesus/seth/dikastes-insync-race-v3.31-full