please review: Ticket 48832 - fix CI test failures