Merge branch 'vak-1594' into 'master'

#1594 Error radius timeout

See merge request !5447
3 jobs for master in 50 minutes and 31 seconds (queued for 2 seconds)