Merge "Omit 'external' changes from ChangesFeed"