Merge "Move template specializations into .cc from .h" into nextgenv2