Sync dev to gitlab.com
The changelog is missing on gitlab.com but not on dev - this is a merge of dev master into gitlab.com master
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
The changelog is missing on gitlab.com but not on dev - this is a merge of dev master into gitlab.com master