fix errors
fix errors
Merge branch 'refs/heads/test_switch_time'