Neha, Sumit | BDSHR-196 | refactoring and fixing shr encounter sync.