Merge remote-tracking branch 'upstream/release/3.11.0' into fix/add-catch-to-log-error-in-notificationStore