Updated from commit 9056e41f7f190b2e7fe06a1bc2520f07a02f0f08.