Merge branch 'features/staticfe-sanitization' into 'develop'