[feature] - foolproof protection
Merge remote-tracking branch 'origin/master'