Soft cascade hot fixes