Update FormBuilderWrapper after Issue #2328777