Draft: fix #2813

Ron Luckerequested to merge
biest-2813 into main

fix #3030

Edited by Ron Lucke

Merge request reports