BZ33629 - Bind the parameters also to initial_state/1 generator
Merge remote-tracking branch 'origin/dev'