Merge changes to work on lxplus into main branch and make both working again.
Merge details
requested review from @rabbertz
assigned to @rabbertz
approved this merge request
mentioned in commit e8dbd172
merged
