Merge "Fixed a bug where notifications were not updated inplace"