It might help to land the template updates first, is there anything I can do to help get those merged?