JAL-1793 update spike branch to latest