Sg conflict resolved

Merged Somnath Ghorpade requested to merge SG_ConflictResolved into staging
  1. Oct 10, 2024