Merge 5.3.1-dev-SOL009 in 5.3.1-dev

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

Merge request reports