Merge branch 'patch/JAL-4184_description_stockholm' into develop