Merge "Ensure insertion order of Python dict" into main