Vinay | Move from visit_type_id to visit_type name
Merge branch 'release-4'