Updated from commit 09df0a11755e18c48d1076b337b3c7b2f047fe0b.