[#84704374] Modified to pass clint