Ticket #25188 - Generic logic so the app does not need to be modified for new engines.