Make sure any parameter values are available as top-level bindings.
Merge commit 'd11dc0424eb5b9a63cb8418d60ed464d4af9ecfe'