Add "Not break the build" feature
Merge branch 'notbreakfeature'