Merge "upgrade paramterizing follow up"