merge 5.1.1-dev-sol005 in 5.1.1-dev

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

This reverts commit 8e16f258.

Merge request reports