Merge branch 'mekano_spike'