Wait for container to be created
Merge branch 'david'