Merge "Add clarifications in the documentation of the `query` command" into stable-2.6