Addressed comment
Addressed comment
Addressed comment
Addressed comment
Merge branch 'feature/fault_tolerance' into feature/fault_tolerance_rake_task