Merge branch 'fix/1825-admin-api-error-codes' into 'develop'