Merge branch 'develop' into improvement/JAL-3830_remove_dock_icon_in_headless_mode