261 Commits (CLDC-1586-spike)