Merge pull request #3335 from lambdageek/dev/system-reflection-assembly