Added configuration for Guard
Merge branch 'feature-guard' into develop
Merge branch 'develop'