Sync with stable version which includes the requests made by Max