Merge in RED/ui from minor-fixes to master * commit 'b8df7ab452ffffe533feebd7a51b61b65887f2d4': manual redaction fixes