changes related to 1-3 points in ATR-19579

Kalliopi Iordanidourequested to merge
b_Mar25_2019 into master

Same as (!22125 (merged)) but rebased as requested

Merge request reports