more debugging
scripted update of code from master at 06dd28c more debugging