Fixed re-marketing code additions: Ticket 7299