Generalize segment modal form elements#6318

apata merged 2 commits intomasterplausible/analytics:masterfrom

annotations/generalize-modal-inputsplausible/analytics:annotations/generalize-modal-inputsCopy head branch name to clipboard