[ADD] JS-20 select lines to reintegrate

Merged Ignacio Goitea requested to merge 7.0-ADD-JS-20 into 7.0-stage

Closes JS-20

Merge request reports