3.3.1 dev sol009

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

Merge request reports