Merge branch 'ATS192630_fix_ClassCastException_in_elementViewer' into sprint74