Merge branch 'list-conns-plus'