BAP-6748: Fixes after review:
- security fixes
BAP-6748: Fixes after review:
- security fixes