Merge branch 'hotfix-2.1.9'
Users weren't able to change the contactalert field
Merge branch 'hotfix-2.1.10' into develop