[IMP] JS258 into PROD

Merged Jose Luis Zanotti requested to merge JS258v2 into 7.0

Merge request reports