Pull from alpha8/12306_ticket_helper

Rebase