Pull nptcg into release branch