brought block branding back, #514
Merge branch 'master' into dev/2.6.x