Probably got that merge mixed up, I'll update this with the logic from develop.