Merge branch 'fix-flint-server' into 'master'

Flint: Fix close of flint server

Closes #2827

See merge request !3802
10 jobs for master in 103 minutes and 52 seconds (queued for 2 seconds)