Set fail safe working : multiple features included
Merge remote-tracking branch 'origin/master'