Fix broken concept build and Ticket 2628