small fixes
Merge remote-tracking branch 'origin/feature-conversation-controls' into feature-conversation-controls
fixes
disable notifaction route
small updates
Merge remote-tracking branch 'origin/feature-conversation-controls' into feature-conversation-controls