Merge branch 'develop' into 'docs/add-clients-to-ex_doc'