[WOTGM-489] Applied patch for WOTG team.