trying this (again)
scripted update of code from master at 44f7b1d trying this (again)