[WOTGM-1156] Refactored previos fix. Added additional fix for DF-4549.