It is both. The CF H Svcs Gp field doctrine is being updated concurrently with the Future Field Force Working Group and some trials and evaluations which will be seen on some upcoming exercises in 2016.
You are likely to see some TO&E changes at the three field ambulances and at 1 Canadian Field Hospital. The higher-level doctrine will likely come out before the TO&E changes, which makes sense given the complexity at changing TO&E's and the fact the approved doctrinal principals should guide procurement and force employment.
Some of this is the result of the changes in health services doctrine in NATO and the changes to the NATO concept of Role 1, Role 2 and Role 3 which Canada needs to bring themselves in line with. Other factors are lessons learned from recent conflicts, changes to Canadian Army force structures (Force 2013), changes to tactical aviation force employment doctrine (Force 2017) and the desire to provide a higher level of care further forward.
If I hear anything I will let you know. If you have any questions let me know and I can ask around. I know a number of people on the Working Group.
MC