Merged cleanup branch back to v1.65