Thanks David and Amit for reviewing the patch.Attaching revised patch addressing review comments.-Nishant