Merge branch 'patch/JAL-4196_structure_viewer_synchronising' into develop