Fix in develop, previously only in master, to allow ports in environment setup.