Sg conflict resolved

Merged Somnath Ghorpade requested to merge SG_ConflictResolved into staging

Merge request reports