Merge branch 'hotfix-2.1.1'
Set the default value of the flag disabling rest alert messages to false
Merge branch 'hotfix-2.1.2' into develop