Merge pull request #4381 from BrzVlad/feature-generational-hash