[#75002932] Implement form-groups in forms