Merge branch 'clean-up-connection-clean-up' into 'ibm-trunk'

Clean up connection clean up

See merge request !58