[PLAT-3422] Handle history correctly for delta results
Merge branch 'develop' into ui/dev