going through every file to winmerge in changes
If you are using the template overrides - - those are the only files you should have to check for new versions and merge if there is one

And yes that has been "fixed"