Merge branch 'amf/mux_view_fix' into sprint56