Merge branch 'da/maint-python-startup'