maybe I'm thinking of HF 17? Do you remember if there was more reshuffling then?

I don't specifically remember but that is very possible. HF17 was more controversial (and ultimately rejected/withdrawn).