Merge branch 'patch/JAL-1286_JAL-1265' into develop