Merge "Revert "Revert "DiskStats Westworld Migration"""