Updated from commit 132d57f1ad07585e857d57495cfc4ac90231027e.