Merge branch 'popover' into dev

Merging popover branch.