Merge branch 'jk/startup-info'