Cherry pick BaseFormViewModel