sendilkumarn Updated few files based on latest dev changes