UV support+Merge

Signed-off-by: rachit-rc96 <rachit.rc96@gmail.com>