Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth...