class: Added header field for scope level info
Merge branch 'origin/class'