Issue #27952: Merge fixcid.py from 3.5