Attribute grid
Merge remote-tracking branch 'origin/1.6' into 1.6