Merge "Revert "Disable cdex-fast + redefine-stress""