Merge "Add an option to reuse connections"