UI-2604: Branding feature UI
Merge remote-tracking branch 'remotes/origin/feature/relooking' into feature/relooking