Pull refactored memoized helpers into 2.99
Created by: JonRowe
This pulls the changes from #937 and #938 into 2.99
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Created by: JonRowe
This pulls the changes from #937 and #938 into 2.99