[OE-4653] form refactor