Merge branch 'holzer-master-patch-25021' into 'master'

Fix conversion

Closes #152

See merge request !474
113 jobs for master in 472 minutes (queued for 12 seconds)