Merge "Notification atoms changes"