Added additional attributes module
Merge remote-tracking branch 'origin/1.2/develop' into 1.2/master