[sr-dev] git:master:ff1ce230: Merge pull request #1931 from ionutionita92/master