#4137 continue reflector refactoring
#4137 continue reflector refactoring