JAL-1553 merge commit