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