Cherry-picked to 6.1: https://gerrit.libreoffice.org/#/c/60677/1 6.0: https://gerrit.libreoffice.org/#/c/60678/
Cherry-picked to /gerrit. libreoffice. org/#/c/ 60677/1 /gerrit. libreoffice. org/#/c/ 60678/
6.1: https:/
6.0: https:/