Merge branch 'feature/2164-unify-api-arguments' into 'develop'