Merge branch 'bug/JAL-2262_dnd-for-local-structure-files' into develop