Updated from commit 295604b31f7e3ccb3e7cd171264bc61617c5c050.