Merge branch 'jk/warn-on-object-refname-ambiguity'