Merge v1.80-cleanup as it passed QA