KRACOEUS-8219:fixed issues with change tracking
Merge pull request #1114 from jwillia/KRACOEUS_8219_1

KRACOEUS-8219:fixed issues with change tracking