Merged with origin/development. Changes to deal with sets as parameters.
Bump dependency on Overture to 2.0.4 (release)