Add timeout to initialization check
Merge branch 'development'