Revert pub extension for demo
Merge master into feature/contact-favorite-color