Merge "Drop the image_comment_temp table"