Hack to remove preserve constraints for NR scenario
Merge branch 'master' of github.com:fhermeni/from-entropy