sync with ports
various fixes for smart_proxy_salt