Merge pull request #1985 from CC-Jeff/CloseEscSerial_Fix