Merge branch 'jk/ident-ai-canonname-could-be-null' into maint