Revert "Revert "Merge branch 'case-integrity' into staging""

This reverts commit a99377d6737c0afdbac20d1ccb49e028488846cb.