Adds check against metric data cache corruption.
Merge branch 'release/2.3' into release/2.4