Updated from commit 76283e1b45272f748db1a1ab22a9882bad45d0a0.