Merge 1c8200366fbcaef54841df1848f9d7da8b2ed451(avalon3.5)