working on the breakage
scripted update of code from master at 69b55a5 working on the breakage