[sr-dev] git:5.0:dd50f9a0: Merge pull request #1285 from sergey-safarov/5.0