Control Panel: global attributes listing and edit page changes related to rebuilding page structure.
Merge remote-tracking branch 'origin/1.1.7' into 1.1.7