Added guard
Merge branch 'install-guard' into development