[sr-dev] git:master:87d23f9d: Merge pull request #656 from grumvalski/fix-563