merge from r1.79 branch during release (changelog and release file changes)