Merge branch 'JAL-1459_dnd' into develop