DEXED-21473

DEXED-21473