[[ Bug 14220 ]] Re-establish the pre-7.0 behaviour of server shell reading
Merge pull request #1612 from runrevsebastien/bugfix-14220

[[ Bug 14220 ]] Re-establish the pre-7.0 behaviour of server shell reading