am 4c3a0457: Support new query parameters introduced in Iaab5c38a

* commit '4c3a04572ead6ad9f0cfc20a34db3252fdb31201':
  Support new query parameters introduced in Iaab5c38a