Merge remote-tracking branch 'origin/8.38-hotfix' into 8.38
TESTING: slightly adjust expected result after scisoft-core commit 350ad3a
Merge -s ours from 8.38 into master