Merged spikes and to-do from master branch