Merge "Vid Template alignment."