Merge in repeat-hidden-values branch for staging

Vellum: repeat-hidden-values+help-text @ 18301cd