Sync with recent changes in Git component