Bug Fixes

Merged Kunal Taitkar requested to merge kunalt_fixes into devbranch

Merge request reports