Merge branch 'refs/heads/query_string_parser'