Merge pull request #6300 from mikeller/fix_smartport_overflow