Merge pull request #6506 from gkhanna79/FixReflectionLoadContext