resolve autolive plugin [deliver #70667992]
merge