Merge branch 'nd/warn-ambiguous-object-name'