Fix several problems of #1899.
Passed
Marcus Eibrink-Lunzenauer
created pipeline for commit
f4bcbfc9
, finished
For main
1 minute 33 seconds, queued for 1 seconds