Merge "Fix the subject line bug"