Spring Rider Bundle: Issue 1 and Issue 2