Merge "Fix comment handling on image upload or deletion"