Merging issue #2479 & #220 - Support template for Popover content