[WOTGM-947] Final changes.