Merge branch 'tr/add-i-no-escape' into maint