[sr-dev] git:master:fe259304: Merge pull request #1734 from Joonake/master