Merge branch 'open-api-clients' into develop