US333: 7.1 improve reslience / messaging around Settings page.