Port to HB.lock#144

pi8027 wants to merge 4 commits intomastermath-comp/finmap:masterfrom

cleanup-phantmath-comp/finmap:cleanup-phantCopy head branch name to clipboard