Fixes #6768 - Hammer set-parameter does not work
Merge remote branch 'origin/develop' into develop