[#64337280] Row checks separated