Merge branch 'amf/element_viewer_fix' into sprint85