Merge branch '316-ext-model-always-enabled' into 'master'

Resolve "ext. model always enabled"

Closes #316

See merge request !205
11 jobs for master in 51 minutes and 12 seconds (queued for 4 seconds)