JAL-984 merged to spikes-mungo