Merge "Check only for added/deleted metadata entries"