Merge "Bring back the SAW notification" into sc-dev