Merge branch 'fix-dss-mux' into fixes