CAAERS-7046 - changes related to STAGE and tracking.