v6.4.0: improve code and increase test coverage#575

davraam wants to merge 2 commits intodatashield:v6.4.0-devdatashield/dsBaseClient:v6.4.0-devfrom

davraam:v6.4.0-devdavraam/dsBaseClient:v6.4.0-devCopy head branch name to clipboard