Merge "Continue to remove code around legacy captions" into main