Merge pull request #4869 from Cynthia-0203/feat/auto-sync-status