Merging changes from pre-release back into a working branch