making public
scripted update of code from master at 64ada61 making public