Repair Regression caused by - !11573
some changes introduced by 4daa6da5, 26b6e299, 17898ce0 were regressed during today's merge conflict resolution of !11573 (merged).
This MR proposes the reapplication of those changes.
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
some changes introduced by 4daa6da5, 26b6e299, 17898ce0 were regressed during today's merge conflict resolution of !11573 (merged).
This MR proposes the reapplication of those changes.