Merge branch 'main' into mullerfa/python-improvements