[sr-dev] git:5.1:f17dd0d8: Merge pull request #1415 from christoph-v/wrong_query_buffer_assignment_5.1