not quite
scripted update of code from master at 9dc086b not quite