Fixed rare case when container startup tooks longer than unusual
Merge branch 'stable'