JS Spike
JS spike merge