Merge remote-tracking branch 'origin/develop' into bug_handling_failure_in_request_for_remote_username