Merge branch 'sync-upstream-new-strategy'