I added some comments that will hopefully help it move along. Looks like it will effect only tests? Are there tests that now fail with this that should be fixed before the release? Otherwise, IMO it doesn't matter much whether this merges before or after cutting the tag.