Merge pull request #1684 from baldurk/reflection-interface-improve

Opt-in improvements to reflection interface