Imrpove the event regisratoin for 3.10.

#4389