Updated from commit 32e4cc510f960a64987b3ab866ca16e13fbcb501.