Sp 09 june 2021 reorg bug fix

Merged Shridhar I. Patil requested to merge sp_09_june_2021_reorg_bug_fix into devbranch

Sp 09 june 2021 reorg bug fix

Merge request reports