Merge branch 'feature/popups'