maybe this will do
scripted update of code from master at 0e20978 maybe this will do