Fixes

Merged Rahul A. Sutar requested to merge Rahuls_Fixes into devbranch

Merge request reports