Move reflection modification to FreeMarker project
Merge branch 'feature-ENT-1209'