Merge 5.3.1-dev-SOL005 in 5.3.1-dev

Giacomo Berninirequested to merge
5.3.1-dev-SOL005 into 5.3.1-dev

Merge request reports