Merge branch 'nd/attr-debug-fix'