EXOGTN-1608 [Edit Inplace] - fix for pass all test case