JAL-2069 update spike with latest