Merge "Add more debug assets" into main