FORGE-940: Waiting for container to stop