branches/fault: added support for fault injection