Fix bug on form privacy
Merge branch 'develop'