Update to b59045551b3d11a3ae49b6c81cc96bd7138c0c9b