SAMZA-1692: Standalone stability fixes.