Merge branch 'master' into 'feature/8906_refactor'
Re #8906 - Client refactor + doc comments (2)
Re #8906 - Client refactor + doc comments