Updated from commit 2bc46348608716d21027ea622dc6f347e6c076b4.