(cherry picked from commit e253752191) Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
e253752191