I heard from a good source in the CAA that a revised version of CAP804 is on short final to land.
As for the 22Gp thing. I used to think that, but then I started to understand how our military groundschool and training system has diverged significantly from the commercial world. Trying to do the thing in reverse is equally tricky as well - if an ATPL(A)/(H) holder wants to join the military and skip the majority of military flying trg it is tricky, even for ME roles. Personnally, I think we missed a trick with MFTS where we should have used the civvy licences as a ‘backbone’ with the military parts like formation, low level and tactics bolted onto it. But I guess that ship has already sailed, sadly?