Force serial number to undefined if not assigned
Merge branch 'master' into dev_v2