Merge pull request #3992 from lambdageek/dev-handles-srassembly