Merge pull request #4809 from bastik/fix-sr