Merge avalon3.5