Minor refactor
Merge remote-tracking branch 'origin/Messaging-Requests' into Messaging-Requests