more
scripted update of code from master at 377cc81 more