Merge pull request #1794 from swt2c/smart_use_serial