SOAP-454: Fixed proxy overrides for environments in Pro. Some performance improvements.