[HHH-7963]
inital snip to use dirty tracker