[BUGFIX] Pass missing original FlexForm variables, add missing variable array merge