Merge branch 'bug/r2_11_2/JAL-3904_structureviewermenu' into develop