Merge branch 'release/4.0'
Add image