gh-106 Update to rebase off m0smith repo