weird
scripted update of code from master at f15683e weird