0.8 backport

Backport parameters handling enhancements from the branch to the master.