more debug
scripted update of code from master at 746aeca more debug