image path fix
Merge branch 'release/1.5.12'