Resolved conflicts.

Closed Somnath Ghorpade requested to merge SG_Conflict_resolved into devbranch

Merge request reports