Added handling of multiple value for single query parameters
Merge branch 'master' into u/ixa1