Merge "Make Settings B&R flow work for HSUM"