fix request parameter handling.
Merge branch 'develop'