Extension: banner manager rebuild (incomplete)
Control Panel: Custom block edit page rebuild (incomplete)
Merge remote-tracking branch 'origin/1.2.0a' into 1.2.0a