wip/mg-lsh/patches
