scripted update of code from master at ac39951 try this now