Merge branch 'nd/warn-ambiguous-object-name' into jk/cat-file-batch-optim