Merge "Fix missed refactor of serial" into pie-vts-dev