Pull @schriftgestalt’s branch into main branch

Thank you Georg!