merged with v1.65-cleanup