FS-5655 --resolve
FS-5665 --resolve this should push the extra ones into the variable and convert it to an array
FS-5661 --resolve