Merge "Use Format_isValid() and Format_isEqual() instead of direct comparison"