Merge branch 'port_register_notification_defer'