14 Commits (sync_core)