Updated from commit 2a3fbc6e36a0b99b49c462838ea99d1b2e6165f0.