Merge pull request #3988 from lambdageek/dev-handles-srmodule