Merge branch 'nd/attr-optim'