Optimize prerequisites and protect
Merge pull request #669 from spumko/feature/pre

Optimize prerequisites and protect