diff --git a/ribbon-core/src/main/java/com/netflix/client/RequestSpecificRetryHandler.java b/ribbon-core/src/main/java/com/netflix/client/RequestSpecificRetryHandler.java
index de4d174090d11b857edfbe1df17112908933aa50..8d3fab65ede0f921023b7d3b6b89a025b5928d7c 100644
--- a/ribbon-core/src/main/java/com/netflix/client/RequestSpecificRetryHandler.java
+++ b/ribbon-core/src/main/java/com/netflix/client/RequestSpecificRetryHandler.java
@@ -35,10 +35,10 @@ public class RequestSpecificRetryHandler implements RetryHandler {
         this.okToRetryOnAllErrors = okToRetryOnAllErrors;
         this.fallback = baseRetryHandler;
         if (requestConfig != null) {
-            Optional.ofNullable(requestConfig.get(CommonClientConfigKey.MaxAutoRetries)).ifPresent(
+            requestConfig.getIfSet(CommonClientConfigKey.MaxAutoRetries).ifPresent(
                     value -> retrySameServer = value
             );
-            Optional.ofNullable(requestConfig.get(CommonClientConfigKey.MaxAutoRetriesNextServer)).ifPresent(
+            requestConfig.getIfSet(CommonClientConfigKey.MaxAutoRetriesNextServer).ifPresent(
                     value -> retryNextServer = value
             );
         }
diff --git a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
index e2b16c2932d2ad3777392087b3faa4e5d6de166c..c712ad85e43ef060c23e5db449597c853a2ed324 100644
--- a/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
+++ b/ribbon-core/src/main/java/com/netflix/client/config/ReloadableClientConfig.java
@@ -456,10 +456,10 @@ public abstract class ReloadableClientConfig implements IClientConfig {
     private String generateToString() {
         return "ClientConfig:" + internalProperties.entrySet().stream()
                     .map(t -> {
-                        if (t.getKey().key().endsWith("Password")) {
+                        if (t.getKey().key().endsWith("Password") && t.getValue().isPresent()) {
                             return t.getKey() + ":***";
                         }
-                        return t.getKey() + ":" + t.getValue();
+                        return t.getKey() + ":" + t.getValue().orElse(null);
                     })
                 .collect(Collectors.joining(", "));
     }
diff --git a/ribbon-eureka/src/main/java/com/netflix/niws/loadbalancer/DiscoveryEnabledNIWSServerList.java b/ribbon-eureka/src/main/java/com/netflix/niws/loadbalancer/DiscoveryEnabledNIWSServerList.java
index 5c6080c32efe96187b8e500793b30e715685e1fd..882563601e9029d482235f0506c0af9f29e802d2 100644
--- a/ribbon-eureka/src/main/java/com/netflix/niws/loadbalancer/DiscoveryEnabledNIWSServerList.java
+++ b/ribbon-eureka/src/main/java/com/netflix/niws/loadbalancer/DiscoveryEnabledNIWSServerList.java
@@ -117,7 +117,7 @@ public class DiscoveryEnabledNIWSServerList extends AbstractServerList<Discovery
         shouldUseIpAddr = clientConfig.getOrDefault(CommonClientConfigKey.UseIPAddrForServer);
 
         // override client configuration and use client-defined port
-        if (clientConfig.get(CommonClientConfigKey.ForceClientPortConfiguration, false)){
+        if (clientConfig.get(CommonClientConfigKey.ForceClientPortConfiguration, false)) {
             if (isSecure) {
                 final Integer port = clientConfig.get(CommonClientConfigKey.SecurePort);
                 if (port != null) {
diff --git a/ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsPortOverrideTest.java b/ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsPortOverrideTest.java
index 3ad809e2931bae452c470e09409a6dad182a2329..df3a0de4027bd2af732de2cafff058bc3f96f169 100644
--- a/ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsPortOverrideTest.java
+++ b/ribbon-eureka/src/test/java/com/netflix/niws/loadbalancer/DiscoveryEnabledLoadBalancerSupportsPortOverrideTest.java
@@ -181,7 +181,6 @@ public class DiscoveryEnabledLoadBalancerSupportsPortOverrideTest {
         ConfigurationManager.getConfigInstance().setProperty("DiscoveryEnabled.testSecureVipPortCanBeOverriden.ribbon.SecurePort", "6002");
         ConfigurationManager.getConfigInstance().setProperty("DiscoveryEnabled.testSecureVipPortCanBeOverriden.ribbon.TargetRegion", "region");
         ConfigurationManager.getConfigInstance().setProperty("DiscoveryEnabled.testSecureVipPortCanBeOverriden.ribbon.NIWSServerListClassName", DiscoveryEnabledNIWSServerList.class.getName());
-
         ConfigurationManager.getConfigInstance().setProperty("DiscoveryEnabled.testSecureVipPortCanBeOverriden.ribbon.ForceClientPortConfiguration", "true");
 
         DiscoveryEnabledNIWSServerList deList = new DiscoveryEnabledNIWSServerList();
diff --git a/ribbon-httpclient/src/main/java/com/netflix/niws/client/http/RestClient.java b/ribbon-httpclient/src/main/java/com/netflix/niws/client/http/RestClient.java
index a68ce5652c9dabf228e9adefe9612de23ed52343..737a0928cf7db43c6299c79e65f975631d6eaf0d 100644
--- a/ribbon-httpclient/src/main/java/com/netflix/niws/client/http/RestClient.java
+++ b/ribbon-httpclient/src/main/java/com/netflix/niws/client/http/RestClient.java
@@ -147,19 +147,19 @@ public class RestClient extends AbstractLoadBalancerAwareClient<HttpRequest, Htt
         super.initWithNiwsConfig(clientConfig);
         this.ncc = clientConfig;
         this.restClientName = ncc.getClientName();
-        this.isSecure = getBooleanFromConfig(ncc, CommonClientConfigKey.IsSecure, this.isSecure);
-        this.isHostnameValidationRequired = getBooleanFromConfig(ncc, CommonClientConfigKey.IsHostnameValidationRequired, this.isHostnameValidationRequired);
-        this.isClientAuthRequired = getBooleanFromConfig(ncc, CommonClientConfigKey.IsClientAuthRequired, this.isClientAuthRequired);
-        this.bFollowRedirects = getBooleanFromConfig(ncc, CommonClientConfigKey.FollowRedirects, true);
-        this.ignoreUserToken = getBooleanFromConfig(ncc, CommonClientConfigKey.IgnoreUserTokenInConnectionPoolForSecureClient, this.ignoreUserToken);
+        this.isSecure = ncc.get(CommonClientConfigKey.IsSecure, this.isSecure);
+        this.isHostnameValidationRequired = ncc.get(CommonClientConfigKey.IsHostnameValidationRequired, this.isHostnameValidationRequired);
+        this.isClientAuthRequired = ncc.get(CommonClientConfigKey.IsClientAuthRequired, this.isClientAuthRequired);
+        this.bFollowRedirects = ncc.get(CommonClientConfigKey.FollowRedirects, true);
+        this.ignoreUserToken = ncc.get(CommonClientConfigKey.IgnoreUserTokenInConnectionPoolForSecureClient, this.ignoreUserToken);
 
         this.config = new DefaultApacheHttpClient4Config();
         this.config.getProperties().put(
                 ApacheHttpClient4Config.PROPERTY_CONNECT_TIMEOUT,
-                ncc.getOrDefault(CommonClientConfigKey.ConnectTimeout));
+                ncc.get(CommonClientConfigKey.ConnectTimeout));
         this.config.getProperties().put(
                 ApacheHttpClient4Config.PROPERTY_READ_TIMEOUT,
-                ncc.getOrDefault(CommonClientConfigKey.ReadTimeout));
+                ncc.get(CommonClientConfigKey.ReadTimeout));
 
         this.restClient = apacheHttpClientSpecificInitialization();
         this.setRetryHandler(new HttpClientLoadBalancerErrorHandler(ncc));
@@ -470,13 +470,6 @@ public class RestClient extends AbstractLoadBalancerAwareClient<HttpRequest, Htt
                 task.getHeaders(), task.getQueryParams(), config, task.getEntity());
     }
 
-
-    private boolean getBooleanFromConfig(IClientConfig overriddenClientConfig, IClientConfigKey<Boolean> key, boolean defaultValue) {
-        return Optional.ofNullable(overriddenClientConfig)
-                .map(config -> config.get(key))
-                .orElse(defaultValue);
-    }
-
     @Override
     protected int getDefaultPortFromScheme(String scheme) {
         int port = super.getDefaultPortFromScheme(scheme);
@@ -489,7 +482,7 @@ public class RestClient extends AbstractLoadBalancerAwareClient<HttpRequest, Htt
 
     @Override
     protected Pair<String, Integer> deriveSchemeAndPortFromPartialUri(URI uri) {
-        boolean isSecure = getBooleanFromConfig(ncc, CommonClientConfigKey.IsSecure, this.isSecure);
+        boolean isSecure = ncc.get(CommonClientConfigKey.IsSecure, this.isSecure);
         String scheme = uri.getScheme();
         if (scheme != null) {
             isSecure = 	scheme.equalsIgnoreCase("https");
@@ -507,7 +500,7 @@ public class RestClient extends AbstractLoadBalancerAwareClient<HttpRequest, Htt
                 scheme = "http";
             }
         }
-        return new Pair<String, Integer>(scheme, port);
+        return new Pair<>(scheme, port);
     }
 
     private HttpResponse execute(HttpRequest.Verb verb, URI uri,
@@ -516,7 +509,7 @@ public class RestClient extends AbstractLoadBalancerAwareClient<HttpRequest, Htt
         HttpClientResponse thisResponse = null;
 
         final boolean bbFollowRedirects = Optional.ofNullable(overriddenClientConfig)
-                .map(config -> config.get(CommonClientConfigKey.FollowRedirects, bFollowRedirects))
+                .flatMap(config -> config.getIfSet(CommonClientConfigKey.FollowRedirects))
                 .orElse(bFollowRedirects);
 
         restClient.setFollowRedirects(bbFollowRedirects);
diff --git a/ribbon-transport/src/main/java/com/netflix/ribbon/transport/netty/http/LoadBalancingHttpClient.java b/ribbon-transport/src/main/java/com/netflix/ribbon/transport/netty/http/LoadBalancingHttpClient.java
index d7fe11a1769301f2040e2b00e928576ace3c8ce3..83f1bc6861c99257f81ac640d1e41837ad4dc8bc 100644
--- a/ribbon-transport/src/main/java/com/netflix/ribbon/transport/netty/http/LoadBalancingHttpClient.java
+++ b/ribbon-transport/src/main/java/com/netflix/ribbon/transport/netty/http/LoadBalancingHttpClient.java
@@ -456,7 +456,7 @@ public class LoadBalancingHttpClient<I, O> extends LoadBalancingRxClientWithPool
         }
         int port = uri.getPort();
         if (port < 0) {
-            if (Optional.ofNullable(clientConfig.get(IClientConfigKey.Keys.IsSecure)).orElse(false)) {
+            if (clientConfig.get(IClientConfigKey.Keys.IsSecure, false)) {
                 port = 443;
             } else {
                 port = 80;