Merge branch 'da/maint-python-startup' into maint