I suspect that the fallout of the McCloud case (Firemen & Judges) will take far longer for the Govt to work out their smoke & mirrors. It took 4 months to work out, 6 months to implement, last years pay rise. As McCloud hasn't yet finalised into reality, I think it'll be 2022/3 before a new AFPS system.
Remember this all has to be installed into JPA - an OTS system, that MOD buggered about with so much that it forgot what a Bank Holiday was!!!!!!