for easier breakpoints
scripted update of code from master at 3693964 for easier breakpoints