Merge branch 'jn/faster-completion-startup'