long delay
scripted update of code from master at bddb667 long delay