Merge commit 'sone-removal-notification-200' into next