Sync with mojo/kraih a265d7f, release v0.29