I'm going to run a few re-builds to see if I can fix the mix-up. If it doesn't work, I'll tag tech into have a look.
Edit: looks like it didn't work. I've logged a ticket with tech to get it looked into. I'll update you when I hear back from them (#2807919)