Merge "Pause resource cleanup"