Merge branch 'custom-notification-table'