Merge branch 'apifix/JAL-1926_JAL-2106' into develop