Some remaining last issues to address.
Associated UI changes: dss-websrc/dss-websrc-mainline!239 (merged)