JAL-2446 merged to spike branch