fix control switch bug
Merge pull request #4839 from dabingnn/develop_controlswitch

fix control switch bug
Merge branch 'develop' into #3480