Fix security vulnerability
Merge branch 'develop'