Merge branch 'cherry-pick-2aed6a28' into 'releases/2.5'

Merge branch 'feature/reenable-solvertest' into 'master'

reenable solvertest

... got 'lost' in the cmake transition

See merge request !75

See merge request !76