Resolve "Fault tolerance optimizations"

Merged Ille, Ondrej, Ing. requested to merge 413-fault-tolerance-optimizations into master

Closes #413 (closed)

Merge request reports