Merge "ttyS1 problem" into MR3.0