RESTWS-430 | feedback on the pull request encorporated