Popover backport from 12
Popover backport from 12

Signed-off-by: John Molakvoæ (skjnldsv) <0835dbafb601d1e4088d26d0286d7121ba48453b@protonmail.com>

endsguy/server,endsguy/server,endsguy/server,endsguy/server,endsguy/server