Alignment with v6.3.6-dev#66

StuartWheater merged 8 commits into

v6.4.0-devStuartWheater/dsBaseClient:v6.4.0-devfrom

v6.3.6-devStuartWheater/dsBaseClient:v6.3.6-devCopy head branch name to clipboard