Don't use * for insensitive
Fix popover issues
Merge remote-tracking branch 'upstream/master'