CAAERS-6295, changed security handling.
Merge branch 'feature/CAAERS-6295' into develop