Merge "Add missing format key conversion"