Moving log tail work to v1.65 branch