Merge branch 'staging' into OCF93-review-security-issues-and-solve-them