FORUM-719 | Fix UT failed