Merge abstract popover changes from 1.4.0 branch