Merge "Rename FdToString for flagging purposes" into main