Merge "Fix email subjects that were hardcoding project"