Merge pull request #25590 from 18alantom/fix-use-get-serial-nos

fix: use get_serial_nos for splitting