Merge branch 'efficiency/JAL-2034_JAL-1421' into develop