Preparations for V2 template release