Release/2.4

Jerome Boucherrequested to merge
release/2.4 into develop

Fix issue with jeton org and variable in array

Merge request reports