Limit connections to Docker
Merge branch '9.4'