Merge "Bug 6903 - Implement Query parameters - fields"