Merge branch 'feature/7912_dragdrop_script_window' into develop