The source project of this merge request has been removed.
Server select fix
Fixes #4725 (closed) (was merged to master, needed a new MR to merge to stable-3.1)
Fixes #4725 (closed) (was merged to master, needed a new MR to merge to stable-3.1)