Merge pull request #10290 from 4712/serial-4way-if_v20005