Merge branch 'cherry-pick-4c5a1382' into 'v9.0'

Fix bug 1533: Update config for nscharm

See merge request !159