Merge 48a736ccda6937f0eeb98c405ef0a23019af0534(avalon3.5)