Merge remote-tracking branch 'origin/requests_class' into requests_class