recreating changes in VET tracking
Merge branch 'PLA-175-VET-tracking' into release-161