Consolidate failedMessages
to use shared store logic
#5043
Merged
failedMessages
to use shared store logic
#5043