TIMOB-12504 First checkin of changes using the new utilities and eventing for errors.