this is copy and paste from ClientBase to make the command building be the same, I'd prefer to take any changes to it to a separate jira as I assume there was a reason they didn't do it initially and put a comment.