+ security check
Merge branch 'feature/security' into dev

* feature/security:
  + security check