Merge "[CS] Support "instant failure" from factories"