[-] WS: Enable feature request #PSCFV-5581, thanks @codl for pull request #593