Merge branch 'jk/startup-info' into maint