Please see the parent issue (#367) for details. This issue is to update the outdated images in branch 6.0.
