[BACKLOG-207] - Moving blocking of startup to a lifecycle listener