Merge "old paths contains all entries when updating"