Fixed Global Attribute duplication
Merge remote-tracking branch 'origin/input' into classes