Merge branch 'feature-astakosclient-docs' into hotfix-0.12.1