Merge pull request #34604 from arielb1/metadata-hash-beta

More robust metadata lock - beta edition