Merge branch 'amf/element_viewer_clear' into sprint58