[sr-dev] git:master:e04e65f0: Merge pull request #1903 from kevin-olbrich/patch-1