We can recall the toing froing ting tong situation last year when I was caught out twice because the changes had not happened despite dates being given.
I don't run that department but would not be surprised that a change will occur after May.
I'm sorry there is no definitive answer as much gossip occurs before the government actually implements what it will.