Merge branch 'improvement/JAL-3393_DMG_Finder_window_improvements' into improvement...