Updated from commit b92630142fbbbedd6588f44f8653585dc1e3d19c.