Merge branch 'ignite-timeout' into ignite-sprint-4