#4137 continue reflector cleanup
#4137 Fix build