ENG-4226 merge 7.1

[alepintus]

No description provided.

[avdev4j]

hi @alepintus
please note there is something missing here: the version updating in the package.json file. I guess this branch has been created from the tag. Do you think we can update it nevertheless?

[avdev4j]

We can close this one since the PRs have been previously merged into both 7.1 branch and develop

[alepintus]

Hi @avdev4j talking with @zonia3000, @antromeo and @cecchisandrone about this PR we were thinking to merge this commits to have the same history and to avoid to have these commits if we have to merge again from the release branch.
WDYT?

[avdev4j]

yes, this is true. let's do it. Next time maybe do one PR to develop then to the release branch so we'll have to do merge that kind of merge commits.
In this case, it's mostly because we did both the dev and the release in a short time frame.