NicolaiO authored Nov 29, 2020 and NicolaiO committed Feb 13, 2021

Closes #1491, #1493, and #1509

See merge request main/Sumatra!1270

sumatra-commit: a0a93cd49bf422f74df57772e7b3110de020f0da