Updated from commit b420eccd37f924d8a91b868a82de3c85d41b642e.