Updated connection parameters for 1.6
Merged changes.