Merge branch 'release/imgfix'
talk fix