Merge pull request #2030 from andyzhangx/migrate-dalec-images-1.25

Merge pull request #2030 from andyzhangx/migrate-dalec-images-1.25 #4812