hopefully this gives behavior i want
scripted update of code from master at 85b381f hopefully this gives behavior i want