[sr-dev] git:5.1:82aad65c: Merge pull request #1826 from sergey-safarov/5.1