[sr-dev] git:master:6d67bf0e: Merge pull request #1411 from christoph-v/wrong_query_buffer_assignment