Merge branch 'feature-astakosclient-auth-url' into develop