Update to commit 4e8e29e4d0e80561ec7574e5c8cef05d8e0c25f8