Bring v1.79_C3 from SVN