Update pull_request with code from official pr