Merge remote-tracking branch 'origin/bug/JAL-1552dragndroptake2' into develop