more visibility
scripted update of code from master at 7198dab more visibility