more issues
scripted update of code from master at 4592515 more issues