CAL-706 fix popover problem because of rebase