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