Merge branch 'feat/reenable_terminated_clients' into 'develop'

Feat/reenable terminated clients

See merge request !936
2 jobs for fix/several_small_text_and_other_changes in 45 minutes and 24 seconds
Status Job ID Name Coverage
  Test
passed #94704
system

00:45:23

passed #94703
test

00:09:18