Merge "Add logic to clean up resources more frequently" into sc-dev