allovsr cherry-picked update