Some updates
Merge branch 'refs/heads/feature-brand'