Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...