Merge branch 'nd/fix-perf-parameters-in-tests' into maint