Fix initial parameter handling.
Merge branch 'develop' into test/run