[sr-dev] git:5.1:ff91717c: Merge pull request #1663 from sergey-safarov/spec2