Merge branch 'jk/no-more-self-assignment' into maint