Update to commit 5805ffebeccae7dd842d2d75db0e8681afc04740