Merge dev with rebranding changes.