Merge "Add FdToString fix flag" into main