Merge "Update guessFileName to use RFC 6266 starting in V" into main