Merge "Changing the default port-binding configuration"