BZ-12246 Mark-up for branding settings