Activate failure timeout fix
Activate failure timeout fix

smjurcak/csm,csm-aut/csm,csm-aut/csm,kstaniek/csm,smjurcak/csm,csm-aut/csm,smjurcak/csm,kstaniek/csm,kstaniek/csm,smjurcak/csm,csm-aut/csm,kstaniek/csm