Lxplus

Klaus Rabbertzrequested to merge
lxplus into master

Merge changes to work on lxplus into main branch and make both working again.

Merge request reports