[simulator]3rd対応完了
3rd simulator
Merge tag 'merge'