JAL-1807 update