Fixed datakind change on test branch (already fixed on main branch)