Merge "Added support for fail-mode."