Merge branch 'measure-critical-data' into next-integrity