Merge "Add support for casefold and product ID to format"