Merge "Do not close idle connections by default" into oc-mr1-dev