Merge "Disable cdex-fast + redefine-stress"