Add attributes grid block
Merge branch 'master' into Bob