Merge "Adjust the bind timeout" into oc-dev