Merge branch 'bw_update_notification_cache_opt' into 'develop'

Bartek Wronarequested to merge
cherry-pick-9eeae217 into master

Optimized update_notification_cache procedure:

See merge request !523 (merged)

(cherry picked from commit 9eeae217)

035e0d3f Optimized update_notification_cache procedure:

Merge request reports