updates for #544 feature
updates for #544 feature

VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR,VHAINNOVATIONS/RAPTOR