Move temp image files away from output_images to limit accidental deletion
Revert "Move temp image files away from output_images to limit accidental deletion"

This reverts commit 52b8757d339d390a82ae92e3933c3c8f8302a002.
Move temp image files away from output_images to limit accidental deletion
Merge branch 'hotfix/28.1'