Merge branch 'bw/attr'