Merge "Make resource_cleanup stable"