Merge branch 'dev' into popover

Merging dev into popover branch.
Merge branch 'popover' into dev

Merging popover branch.