Fix a small regression
Merge branch 'unknown-serial-status' into bleeding-edge