Optimized update_notification_cache procedure: See merge request !523 (cherry picked from commit 9eeae217) 035e0d3f Optimized update_notification_cache procedure: