Updated from commit 83549e2321d042ba10293b8c132e14aef3e5c61d.