Get all the sp4 changes into the repo before I start making changes.