Merging issue #2479 - Popover template