Merge branch 'configurable-notifications-250' into next