Merge "Update thermal file owner" into main