Merge pull request #3320 from lambdageek/dev/reflection-in-managed