please review: Ticket 49552 - Fix build issues on F28