reorder to get correct format value
Merge branch 'fix-format-inconsistency-3' into build-28