Merge "Fix missed refactor of serial" into pi-dev