Round1 critical

merge critical items