fmt
Dont close popover unless we need to close it
Merge branch 'master' into builds
7.758