Merge "Add cleanup for all data structures" into main