DDBNEXT-1177: Fix bug with lastHit
Merge branch 'DDBNEXT-1177-BOZ' into release/4.3