CLSN-552: notification issues resolved