Merge branch '268_fix_connection_model_handling' into 'master'

Fix connection model handling

Closes #268

See merge request !134
5 jobs for master in 11 minutes and 59 seconds (queued for 5 seconds)