Merge branch 'fix/notification-id-index' into 'develop'