Removed COMMON_PANELS, using Page.promote_panels instead
Merge remote-tracking branch 'origin/cleanup' into cleanup