Merge branch 'develop' into improvement/JAL-3420_match_jvl_icon_with_new_website_jvl_icon