Merge branch 'Bug_fix_element_viewer_exception_while_streaming' into sprint56