Merge branch 'nd/attr-debug-fix' into maint