CLC-1075 WIP refactoring to separate saving notifications from translating them