Merge "Fix register for notification logic"