try this 2
scripted update of code from master at b960855 try this 2