Merge branch '1335-user-api-id-fields-relations' into 'develop'